[ADT] Delegate among DenseMap constructors (NFC) #168309
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch teaches DenseMap constructors to delegate to other DenseMap constructors where we can. The intent is for these constructors to build on top of a higher-level concept like the default-constructed instance instead of calling init on our own. This is part of the effort outlined in llvm#168255.
Member
|
@llvm/pr-subscribers-llvm-adt Author: Kazu Hirata (kazutakahirata) ChangesThis patch teaches DenseMap constructors to delegate to other DenseMap The intent is for these constructors to build on top of a higher-level This is part of the effort outlined in #168255. Full diff: https://github.com/llvm/llvm-project/pull/168309.diff 1 Files Affected:
diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h
index 86592f12ce62c..fa87b812f9bf8 100644
--- a/llvm/include/llvm/ADT/DenseMap.h
+++ b/llvm/include/llvm/ADT/DenseMap.h
@@ -751,18 +751,12 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
init(NumElementsToReserve);
}
- DenseMap(const DenseMap &other) : BaseT() {
- init(0);
- this->copyFrom(other);
- }
+ DenseMap(const DenseMap &other) : DenseMap() { this->copyFrom(other); }
- DenseMap(DenseMap &&other) : BaseT() {
- init(0);
- this->swap(other);
- }
+ DenseMap(DenseMap &&other) : DenseMap() { this->swap(other); }
- template <typename InputIt> DenseMap(const InputIt &I, const InputIt &E) {
- init(std::distance(I, E));
+ template <typename InputIt>
+ DenseMap(const InputIt &I, const InputIt &E) : DenseMap(std::distance(I, E)) {
this->insert(I, E);
}
@@ -901,19 +895,15 @@ class SmallDenseMap
init(NumElementsToReserve);
}
- SmallDenseMap(const SmallDenseMap &other) : BaseT() {
- init(0);
+ SmallDenseMap(const SmallDenseMap &other) : SmallDenseMap() {
this->copyFrom(other);
}
- SmallDenseMap(SmallDenseMap &&other) : BaseT() {
- init(0);
- this->swap(other);
- }
+ SmallDenseMap(SmallDenseMap &&other) : SmallDenseMap() { this->swap(other); }
template <typename InputIt>
- SmallDenseMap(const InputIt &I, const InputIt &E) {
- init(std::distance(I, E));
+ SmallDenseMap(const InputIt &I, const InputIt &E)
+ : SmallDenseMap(std::distance(I, E)) {
this->insert(I, E);
}
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch teaches DenseMap constructors to delegate to other DenseMap
constructors where we can.
The intent is for these constructors to build on top of a higher-level
concept like the default-constructed instance instead of calling init
on our own.
This is part of the effort outlined in #168255.